From 090f81d3f5f2aaabd05e52747de5a65f8e454094 Mon Sep 17 00:00:00 2001 From: Tim Deegan Date: Thu, 2 Jun 2011 13:16:52 +0100 Subject: [PATCH] x86/mm/shadow: emulated writes are always guest-originated actions and never happen with the paging lock held. Signed-off-by: Tim Deegan --- xen/arch/x86/mm/shadow/multi.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index d482d3c82e..40b5b6e961 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -4810,11 +4810,8 @@ static mfn_t emulate_gva_to_mfn(struct vcpu *v, } /* Translate the GFN to an MFN */ - /* PoD: query only if paging lock is held (to avoid deadlock) */ - if ( paging_locked_by_me(v->domain) ) - mfn = gfn_to_mfn_query(v->domain, _gfn(gfn), &p2mt); - else - mfn = gfn_to_mfn(v->domain, _gfn(gfn), &p2mt); + ASSERT(!paging_locked_by_me(v->domain)); + mfn = gfn_to_mfn_guest(v->domain, _gfn(gfn), &p2mt); if ( p2m_is_readonly(p2mt) ) return _mfn(READONLY_GFN); -- 2.30.2